From 9b3685ff49496043c842244ccb1a9925ec38ae57 Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Tue, 12 Sep 2017 11:01:40 -0400 Subject: [PATCH] Clarify that .cargo/config files are unified --- src/doc/book/src/reference/config.md | 2 +- src/doc/config.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doc/book/src/reference/config.md b/src/doc/book/src/reference/config.md index a815bf981..13793cf34 100644 --- a/src/doc/book/src/reference/config.md +++ b/src/doc/book/src/reference/config.md @@ -9,7 +9,7 @@ manifest, see the [manifest format](reference/manifest.html). Cargo allows to have local configuration for a particular project or global configuration (like git). Cargo also extends this ability to a hierarchical strategy. If, for example, Cargo were invoked in `/home/foo/bar/baz`, then the -following configuration files would be probed for: +following configuration files would be probed for and unified in this order: * `/home/foo/bar/baz/.cargo/config` * `/home/foo/bar/.cargo/config` diff --git a/src/doc/config.md b/src/doc/config.md index 679bc5f9b..472d5ca0d 100644 --- a/src/doc/config.md +++ b/src/doc/config.md @@ -9,7 +9,7 @@ manifest, see the [manifest format](manifest.html). Cargo allows to have local configuration for a particular project or global configuration (like git). Cargo also extends this ability to a hierarchical strategy. If, for example, Cargo were invoked in `/home/foo/bar/baz`, then the -following configuration files would be probed for: +following configuration files would be probed for and unified in this order: * `/home/foo/bar/baz/.cargo/config` * `/home/foo/bar/.cargo/config` -- 2.30.2